This reverts commit 131f23a4. Bug: 123510633 Bug: 127305289 Reason for revert: b/127305289 Change-Id: I59905779fe8c7d7551c0fa6c8693fb64eb6760b2