Merge "Merge "[API Feedback] Rename getChannelNumber to getNrarfcn" am: 8273d66e am: b7f5e378 am: 746e386b"