Merge "BACKPORT: Add CTS for CellInfoNr" am: 72dc326d29
am: 12f17ae054

Change-Id: I3229828590cdf01083f85381c28f923b4ce40677