This reverts commit 52e7ab8b. Reason for revert: b/179796975, this broke a CTS test Change-Id: I5e5544dd625b474f7589d2ec32b3eebef9a4487c