Merge "[CM] Fix NPE due to unvalidated callback value"
am: 31717ff7f5

Change-Id: Ib3fde31d88c36469cdee1e3578606d130a9817cb