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

* commit '1de65a91b9d174b26b594073eb1ee0dcccb31819':
  Fix error message to match CTS