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

Change-Id: Idf439c1f6badd715776eaaced1a781b066ba6d37