This reverts commit bf794e45. Reason for revert: b/243434675 Change-Id: I5cfdd6a7c21ed322f50d7605fdd470b41726f4cf