Updates for release 4.0.

Build SHA: d7f87fec810fc7a1149c8a702672dccd2e178460