Merge "Merge "Add VoPS support info for NR" am: 98763306a2 am: e6cbb031cd am: fd65c23661" into sc-dev