This reverts commit 9a96e9ec. Reason for revert: Possibly caused b/279686368 Change-Id: I5a5d227eb3327bdd5aa7c903b2aa95c8c7290038