Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0" into rvc-d1-dev-plus-aosp