a96f29e28d
This reverts commit 543857f496.
Reason for revert: closing b/242163205
Fixes: 242163205
Change-Id: Ia1279984f58366051101d650d095ae1e4a632654