This reverts commit 3e8bd0f3. Reason for revert: b/72710855 Change-Id: I1378ccb5c5c16256e472e1ff7c3ad2460e091300 Fixes: 72710855