Merge "Release notes for f51d0d9a819f8f1c181350ced2f015ce97985fcc"