12c346fbab
This reverts commit d98bb0b979.
Reason for revert: b/383917141
Change-Id: I503fd7136b927064a54e428e422335c06e221e2e