Merge N-MR1 to remote

Change-Id: I0b3bbde03d613524cd1a5c2eb0e9b1647f932525