Add bug number (bug 828173) to FIXME comment.

DONTBUILD.
Automatic merge