da65dc3dd3
This reverts commit 8893098446.
Reason for revert: b/203806263
Change-Id: I5e1644e0163ef07d0bec4a70b9dea799ab69f1b5