This reverts commit e35d411c. Reason for revert: b/179846685 Change-Id: I901b2b9d143c2f8cf9127fa9dc0ccc8198c45dc4