N-MR1 upgrade back merge to dev branch

Change-Id: I2788d39bcff496740f89dc9391ae3c1aea15e92f