Comment 18 for bug 1746536

Based on the error message, looks like a merge conflict marker snuck in. I've rebased the branch and signed off on it; the latest branch is user/gmcharlt/lp1746536_rebased.