N-MR1 upgrade back merge to dev branch

Change-Id: I0243e733814fd7a90107cb03711d6fc6ba5fe461