Merge N-MR1 to remote branch.

Change-Id: I57582e63ef24a77f00341701a0ef3cc6fe17b169