[automerger skipped] Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" am: 994f656312 am: 32d164ba41 am: e9fa64cc5c
am: a69d2946f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I23c8859a716b60115006d25ea040df7d5d63d40c