This reverts commit ddf1b4b476. Bug: 112064298 Change-Id: I6c4d0a52b28d0d09f37bd5c9c8da5f6c2b4791cb
ddf1b4b476