Merge N-MR1 to remote

Change-Id: Ibfbe502ebae01164a0f9e91eb571563338b5da2e