This reverts commit 1a732211. Reason for revert: cts failure, b/128641982 Change-Id: If27a39d8d4f6cc03c642b63be1a32af187ce8758