This reverts commit 0be54555. Reason for revert: b/276773593 Change-Id: I7749bfe258b731e4ac6ce64e41a6ca78944bf69e