This reverts commit f6e4cfd9. Reason for revert: b/123972211 Change-Id: I1ea199c27e224bbd27dee7692f9f448ca9c2b6d1 (cherry picked from commit 1906e776)