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

* commit '77c859f4301633b033dc55f366884f55a1041e67':
  Fix Harmony-707 test for CTS