Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
am: 216b1ed2f5

* commit '216b1ed2f515c4b7fb97f17a59660b0a44dcdd71':
  Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""

Change-Id: I65bd31fcaf78ad40e3ac42221acfea740207e740