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

* commit '7b0ea6e4677c7a3add73cb535812d83fe0520e97':
  Enable more advanced CTS tests.