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

Change-Id: Iecfa40fe34c2054d58a9e8239b855c1a831764c0