Merge "Revert "Release notes for aacdb664a10""