This reverts commit c02a365485. Change-Id: I11d31632469a594c0637f035bdd74ba60b2ac33e
c02a365485
Bug: 9833890 Change-Id: I0af4a358cc1457dc08c32744b5c170bd2a3382c9