am 9ae2eb2e: Merge "Fix Harmony-707 test for CTS"

* commit '9ae2eb2e586d43f92c6339e9d7072ec1eef3f0ed':
  Fix Harmony-707 test for CTS