This reverts commit 2e7abeb570. Reason for revert: b/197917451 Bug: 197917451 Change-Id: I570fe494976b3676074a9b8794859db75b827120
2e7abeb570