Merge "Add NR to CellInfo"
am: 35cf55c4eb

Change-Id: I2753e3f851f1e3c3d2c617b5d930efc980ecaa7f