Merge "Release notes for b1d215726e"