This reverts commit c02a365485. Change-Id: I11d31632469a594c0637f035bdd74ba60b2ac33e
c02a365485
Bug: 9059539 Change-Id: I7fe6520e4eafcb7e1748b8bf011333c7e0da7ac2
Bug: 5738545 Change-Id: I20f31c4ff57a06e6df93ce3cfe4d032afd5bacc7