Merge \"Revert \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\"\" into nyc-mr1-dev
am: 47383ac698

Change-Id: Ie77c32e654c396f59e92afdbd038d9c1ac4b211a