Merge pull request #21244 from github/idrissrio/cpp/overlay/changes-json

Merge pull request #21244 from github/idrissrio/cpp/overlay/changes-json #4846