This reverts commit dca5b93b. Reason for revert: b/156868543 Bug: 156868543 Change-Id: Ia59450ef160021494a114715a0035437b28e8d00