am 3e3a7b3b: am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev

* commit '3e3a7b3b1ed641dfa7c321f48bd228c59dc3c180':
  Fix possible NPE