This reverts commit 0fd6748bf6. Bug: 159056748 Change-Id: I850c0d29e07c74143868c6c63cef63649a449c9e
0fd6748bf6