am da013597: am 1de65a91: Merge "Fix error message to match CTS" into jb-mr2-dev

* commit 'da013597edcc4239ffac3af15990a170e6d2d812':
  Fix error message to match CTS