This reverts commit d59dab94c4. Bug: 112843624 Change-Id: I3d0f1b61e899b162e65c18662f9d27dd794a9a30
d59dab94c4