Merge "Import platform SDK from build 7307057" into sc-dev