This reverts commit ece1fa0b. Reason for revert: b/144982898 Change-Id: I95834b3e6b28d569a28088357ab6bfb4d3a0c7ff