Merge changes from inside google

Note - this pull includes some information about the forthcoming `@AutoAnnotation` in the documentation, but the actual code change is pending a few internal build fixes.