Merge \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\" into nyc-mr1-dev
am: 7b352c1d70

Change-Id: Ib23fca169a84e412643a8fcc79ed33126485192f