Merge "Import platform SDK from build 5484155"