am e9d51850: am 2e667679: Merge "Removal of a broken CTS test"

* commit 'e9d51850d10bac6ab5e2ba5a113d1b0b8e9ee198':
  Removal of a broken CTS test