Merge "[CM] Fix NPE due to unvalidated callback value" am: 1b7640a762 am: cc65a628eb am: 8e4ebb79d4
am: 3a1c61f315

Change-Id: Ic8c5ce53747c4201bc76d169c0c6b21fd55007a7