This reverts commit ed8318e4e8. Bug: 34378805 Change-Id: I22b683f774813724f220b1b8584ab188f3cf4fa7
ed8318e4e8