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

* commit 'df5c47c84e5cc97ded2cceca5a2be37fc75c1556':