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

* commit '524d242b9ee697c19d0aa31f5d3d2e60600881c5':