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

Change-Id: I5dee65ea78b9fa8c528fc0d7a0de99f9cf67a2e9