am 05565f5f: am d5bc834f: am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit '05565f5f01d062672dc27ffce5a2f85227c4bfaf':
  Fix NPE