Merge N-MR1 to remote branch.

Change-Id: I9186fd8dd9dda9ffab83d756fa8b74cb9af554b1