This reverts commit 6945710e. Bug: 64345190 Test: n/a Change-Id: Id0aa0f3c9fca64476d163ea8b42a74182050b3ae