This reverts commit 76ea768b. Reason for revert: b/127738408 Change-Id: I09eb93a255310c3749d25d31db77126c6133aa0c