Merge "Setting PLATFORM_VERSION(_CODENAME)? to NMR1" into nyc-mr1-dev