This reverts commit 7344766886. Reason for revert: b/282035015 Change-Id: I38db287f730048d3e1e5041f1853bdae214e1a66
7344766886