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

Thanks a lot. Note that I have replaced two Strings with the corresponding externalized ones (saving us from possible problems if we ever were to change them).