This reverts commit 5228cc20. Reason for revert: b/144982898 Change-Id: Ia28e2daff5a5904f4a75d6fb0ea1e3c855d68616