This reverts commit84269d349d. Reason for revert: causes b/176884453 and b/176992421 Change-Id: I3398674a0acbad8329df5d341ae074ac073a6bf9 (cherry picked from commit229497d182)
This reverts commit84269d349d. Reason for revert: causes b/176884453 and b/176992421 Change-Id: I3398674a0acbad8329df5d341ae074ac073a6bf9 (cherry picked from commit229497d182)