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

* commit 'd5bc834f413d08c6c9db89b0d27e636361661d51':
  Fix NPE