This reverts commit 8833d1eb. Reason for revert: b/151050221 Fixes: 151050221 Change-Id: I5ad75dae0471a4e87b46e5fc2f95f38bb010c4c0