Merge "CTS... Bug #6950508" into jb-mr1-dev