This reverts commit 8688eb4f. Reason for revert: Probably causing b/176240229 Change-Id: Id92d1f1589e8927f372960ec2cc5d262d10ad161