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