am 4e7c16f2: Merge "Better error handling when CTS build is not valid." into ics-mr1

* commit '4e7c16f22f2da2ffe2ff181b8c327755bfeb87a0':
  Better error handling when CTS build is not valid.