Merge "Import platform SDK from build 5484155"
am: 33d4523f77

Change-Id: I4c628b74fde0bfbdd950f4405c6ca9417b11efd6