Merge "Tone down a fatal assert" into jb-mr1-dev