This reverts commit 49f09a36. Reason for revert: b/271045282 Change-Id: Ice56137c5567a38d15cc39f80497ce74bc18650f