Merge N-MR1 to remote

Change-Id: I025fce43a7c2e31ffd6aa074130fe12e7192f6c7