Merge "Added CTS test for secure stop APIs" into jb-mr2-dev