This reverts commit 13a8d14f. Reason for revert: Build breakage - b/151854914 Change-Id: I8ea4ac36605c8df92df92a286a8712e40a6944db