Merge N-MR1 to remote branch.

Change-Id: Id223f8f73908ba347f50cd240422f66c9ccb6135