This reverts commit 7f179278. Reason for revert: b/286118111 Change-Id: I916b9b0a65e98031092fef262e2a6a8d4cae620b