Partial revert of 244fa92f. Reason for revert: cts tests on -user builds is broken Bug: 147113465 Change-Id: If8dea0b8998e6273221983e7feb1b5f580088b83