Merge "Update platform package version to 2 [DO NOT MERGE]" into nyc-dev