This reverts commit 511a000f. Reason for revert: b/148087431 Bug: 148087431 Change-Id: I42e7cc34db93f09d4bd604d3dfcb25557495973d