Merge "Start release notes for 2.5"