This reverts commit b00cce84. Reason for revert: b/72459151 Change-Id: I71593b4b323d69edb548dcb1bb0e1f4eb7cddbc9