Merge N-MR1 to remote branch.

Change-Id: I80934ad37bac0b0d7c67acbb527d1e5f9d781c7c