Merge N-MR1 to remote branch.

Change-Id: Ie8b9838d0fdd3d2035dbc85fb3d7e7a55770fc63