Merge "Add NR to CellInfo" am: 35cf55c4eb
am: ad7bacce36

Change-Id: I23865ded492f2252137c846045c11360fda37823