am c63aa962: Merge "Fix NPE." into jb-mr1-dev

* commit 'c63aa9621821b3f1e32292362cce76cd1899d932':
  Fix NPE.