N-MR1 upgrade back merge to dev branch.

Change-Id: Ida53689b999d552219e6017e6906faf889ffb939