Added missing changes file entry from the cherry-picked change