Merge N-MR1 to remote

Change-Id: Ib1540ccabd9059757276804b8a74fcbcd3da1b99