This reverts commit 6541ef1562. Bug:4970237 Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e
6541ef1562