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

Change-Id: Iaf13c8d20939fbc66a8a9210212c38e092e80bd6