Merge \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\" into nyc-dev am: ddc0c5e0a0
am: 0c822614f5

Change-Id: I18708266b1dfd0f955980d61b94d7c8c8457056d