N-MR1 upgrade back merge to dev branch.

Change-Id: I97da8f62b135f55dd358d6aaf12983b7b0a39a33