N-MR1 upgrade back merge to dev branch

Change-Id: If109abe5aeba28b7dce37ff1382bc6589b680c2a