Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev
am: d22aeb6899

Change-Id: I6ddf3c8cfc55412458e8dc5720b44154278c9a4d