Merge "Move SDK platfrom component to rev 4" into nyc-dev