Merge N-MR1 to remote

Change-Id: Id64e4f0b3605b8a43b33d6b3e76917a0a3eb7b91