This reverts commit edcdd961. Reason for revert: suspect of b/182929692 Change-Id: I8c32a10b6e1728c76635b04345fb282e89520355