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

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

Change-Id: Ib9f4de25f04147dffd2ae67e35125706a8132a78