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

Change-Id: Id0cf38066b99d6c77bc39aac55b81cd943b85460