Add ChangeLog entries for release 2.1.1.
Merge remote-tracking branch 'google/release' into develop