Merge "Release notes for 1dd14dce and b3830611"