Fixed pluralization, Javadoc, Nullable, and static import stuff.

As soon as this is reviewed and merged, I'll cherry pick into 1.6.x.