This reverts commit cbbef45d. Reason for revert: b/237424596 Change-Id: I601f2ad4d40ca9b379cb757d033641fce5fa2819