am 71f6426a: Merge "Add nullness check." into jb-mr2-dev

* commit '71f6426ac3787f22a0078ed42dbf8f568eebf2f8':
  Add nullness check.