Merge N-MR1 to remote branch.

Change-Id: I90e3dbd86f89126e919b260e96412b5fd051c97b