This reverts commit d86481e6. Reason for revert: Possible cause of b/175877133 Change-Id: Iedbb835c6daeb95b337f0db699160c5ce037013e