This reverts commit 1051bbe325. Bug: 64312574 Change-Id: I6a3456172e22e94df30dcbe90988db8592886a78
1051bbe325