am 696eda3a: am 18f69b02: Merge "Fix NPE" into jb-mr1-dev

* commit '696eda3a7531f962a21a66553562d03667b7f6c2':
  Fix NPE