bug 827458: need updates for tb17 esrs. r=rail