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

* commit '49378d8e3ee17e2856c796be64fba7e604961bf2':