This reverts commit dbecbe6f61. Reason for revert: b/149112222 Change-Id: I11981b2daacf8b07177fe906d88de05ca40810c1
dbecbe6f61