This reverts commit 35492cc9. Bug: 117924387 Reason for revert: Causes test failure Change-Id: Iff09dcb17fb26bb4150e4e8562f9dd461e7ca55a