This reverts commit 6a6b416c3d. Reason for revert: b/148838390 Change-Id: I9be2c370c6923e9d7293e4eff5306bc54d49ade2
6a6b416c3d