Patch Set 1: Looks good to me, approved; IP review completed

I generally dislike nested classes, however making them static is right here. In the future, we should consider refactoring out label providers into a shared and global one. I have opened bug 316929 to track this enhancement.