Merge "Fix inconsistentcy API in CellInfoNr"
am: 85de0791e4

Change-Id: If59a8a3dd376bb63740c8272e8b3056bb75b8e4c