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

* commit '4a1d95139a57b8726fb168b08a5c54b9a134c8df':
  Fix NPE issues seen by CTS