This reverts commit ab79ac8e. Reason for revert: Breaks CTS test according to b/273285596. Change-Id: Ie787ba4f9ad1510d598aeac2ad70722ad61e2e0d