Merge "Fix inconsistentcy API in CellInfoNr" am: 85de0791e4 am: a2edbe577c am: 47d397e28e
am: e05f762b42

Change-Id: I43dd060373aead510832d6ebb6cb814d342a0abc