This reverts commit 954252fd. Reason for revert: b/148482594 Bug: 148482594 Change-Id: Ia6e0436231545e6792c8dea9e267e1e05208dc3f