This reverts commit 8cf68d6a. Reason for revert: b/148087431 Bug: 148087431 Change-Id: Iad01610157f507ffdc648e2b237b1fe7617ba775