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