am e02dc783: Merge "Enable more advanced CTS tests."

* commit 'e02dc783d27f57c7e7c4db3fb24f208613465daf':
  Enable more advanced CTS tests.