am eba508d0: am 932ec21b: Merge "Null check; back behavior" into jb-dev

* commit 'eba508d0697c06c4a889c06ad7728a0cbce78e49':
  Null check; back behavior