Merge N-MR1 to remote branch.

Change-Id: Ic883ebb63ccebd1bccd87cf7c39aee79f7b2c114