Merge "Import platform SDK from build 7304504"