Merge "Fix error message to match CTS" into jb-mr2-dev