Merge N-MR1 to remote branch.

Change-Id: I64e165c5b8587138a80bcd02cdf25dfbd244c440