Update CM SHA to cherrypicks for release 38
Merge pull request #7401 from adobe/nj/cm-release-38-cherrypicks

Update CM SHA to cherrypicks for release 38