Merge "Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0 am: c7595b9b1e am: 11a39972e1" into main-plus-java-next-dev