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

Change-Id: I5a6e2e92852f76251e8c1bfcd3c06c6773ec1fe4