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

Change-Id: I4bf6c9d42b8b5a929b05a0280ab52dd5ee9a87ed