This reverts commit 2ca753bd06.
Reason for revert: Fix b/289173795
Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc
This reverts commit 2ca753bd06.
Reason for revert: Fix b/289173795
Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc