Merge \"Revert \"Revert \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\"\"\" into nyc-mr1-dev
am: 14c2a1586b

Change-Id: I1b95f5049e64a536834f785157748ae20ec9e8a1