Bug: 7182109 This reverts commit c7c85b34da. Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b
c7c85b34da