am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev

* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436':
  Crash on non-eng builds due to lacking null check.