am c741f5c1: am 983faeed: Merge "Fix NPE" into jb-mr1-dev

* commit 'c741f5c13d5976289289b65ce3c1e7b71be4c266':
  Fix NPE