This reverts commit edce354f. Reason for revert: b/148087431 Bug: 148087431 Change-Id: I384301ca3ac04228b9293257db4cf455d5a6fb7a