This reverts commit 313d225c. Reason for revert: b/74159113 Change-Id: I483ecdd80d26fca8451cd270b4fcbe34379839cb