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