Merge "Release notes for I050292dbb76821f66a15f937bf3aaf4defe67687"