Merge N-MR1 to remote branch.

Change-Id: If80b5a8cf326b9995f4a46f16a5418222aa72fde