Merge "Import platform SDK from build 5320903"