Merge "[CM] Fix NPE due to unvalidated callback value"
tree: f2663c308ee8dc8135dc9145fe49c2bb14ca0d03
  1. core/
  2. services/
  3. tests/