am d87bb312: am 4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev

* commit 'd87bb3124659edbc9d63988855f0caaa00817ebd':
  Fix NPE issues seen by CTS