This reverts commit b6415618. Reason for revert: Caused regression of b/149213586 Bug: 148639826 Bug: 149213586 Change-Id: I5248e03b42e3f24a6e2abb134d0bf339e77f484b