This reverts commit 6ab7f6e7. Reason for revert: 157863128,157868785 BUG: 157863128,157868785 Change-Id: I9f10f4d98b0d6c122af9f7736de3d096ceb3fde9