This reverts commit 059d865c. Reason for revert: b/269440742 Change-Id: I22526181e57b24b6e17ce93c1e7d06ea829a17cc