This reverts commit 1e7c172ad5. Bug: 132292477 Test: None. Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
1e7c172ad5