Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" am: 994f656312
am: 32d164ba41

Change-Id: I57b40eb0cbaaca86367e81adf5f95875fbed2da2