This reverts commit a0a4828614. Bug: 34378805 Change-Id: Icbdbfbde2efe8eaebbe4334a679e3b3247057388
a0a4828614