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

* commit '1976dd91edf6823f7ea5d42ae3ea48eb8f425cf5':
  Add nullness check.