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

Change-Id: I48da0dd235696eb93affdc232284ef3432e84f96