Merge "Remove bad assert from a test." into jb-dev