This reverts commit 2e9d4a5b. Reason for revert: b/154599464 Change-Id: Ic45e6af285c1e9552be6b296abf7a499f4cdafdc Bug: 154599464