This reverts commit a0ba51c2ab. Bug: 35293781 Change-Id: I5f0b9000535ac0bcbbe125fe781c20c5fb0c8782
a0ba51c2ab