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

Change-Id: I3b0a14e9d6bc002472b8f79ca5004c53869dacec