This reverts commit 47556d88. Reason for revert: b/274515863 Change-Id: I0e45385bb943a8454df431c0a8818df5b18fd1a9