This reverts commit c02a365485. Change-Id: I11d31632469a594c0637f035bdd74ba60b2ac33e
c02a365485
Bug: 9059539 Change-Id: I7fe6520e4eafcb7e1748b8bf011333c7e0da7ac2
Bug: 7455289 Change-Id: Ifdf6f38a07f75fb2154a17899e6be5f89082638f