Merge "Import platform SDK from build 7488740"