This reverts commit 0b21b3d725. Bug: 7366814 Change-Id: I0992e9ca1a6e36ebc3a717137a6c494835fad712
0b21b3d725