This reverts commit 6be02644. Reason for revert: b/148087431 Bug: 148087431 Change-Id: If2e30f4123f5add54265158bf7eb9c733041fac4