This reverts commit b1274236. Reason for revert: b/289418267 Change-Id: I0a94675e09a82b55d62e58dbeea0d3186c754ed3