This reverts commit 8ddfb479. Test: presubmit Bug: 69975306 Change-Id: I05cb545eb0adc77298dddf2dea2997ef36b58a5f