Merge "[CM] Fix NPE due to unvalidated callback value" am: 62790fbdfe am: cc65a628eb am: a255662062
am: 566a97bc7a
Change-Id: Ic8c5ce53747c4201bc76d169c0c6b21fd55007a7
This commit is contained in: