Merge "[CM] Fix NPE due to unvalidated callback value" am: 31717ff7f5 am: 51ddc176ab am: 60af769e49
am: 0bc4520c37

Change-Id: I51f708a4fc482d0fbe829da2b582ca4d00df6bf6