This reverts commit 2ebf2466. Reason for revert: b/239424216 Change-Id: I38660e65b42b62cb5203d2e6b69d914d4251a6fa