Merge "Update release-notes (follows-up d6028a18 and a1e602a)."