Merge "Fix NPE issues seen by CTS" into jb-mr2-dev