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

Change-Id: Ib8f58a2e5930dfd4f3b8a25dcd0d02d4455a5b24