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

* commit '1e5b35d7974a22ab0168cc68281d55ea58eb783c':