This reverts commit b5e316c3. Bug: 137819199 Test: manual Change-Id: I31e60725035d5af06884521499aed9fc07e505c9