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

Change-Id: Ia2cc04b42288ea987483e5ab0e0a10093dc49502