Bug: 35390781 This reverts commit 4eb7cea562. Change-Id: I94567d333b40f99f7a2573125259f4ab575a0519
4eb7cea562