This reverts commit 33139c16. Reason for revert: A CTS test is now flaky, see b/197093424 Change-Id: Ife432938448cc24bb2a61fa30873270bcf2ee1a7