NEON CHM additions

[bhass-neon]

[google-cla[bot]]

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

[bhass-neon]

@simonff I believe we are synced to google main and the CLA is now signed, can we try this again?