[automerger skipped] Merge "Import platform SDK from build 5484155" am: 33d4523f77 am: e00773cea5 -s ours
am: 63ffab5704 -s ours
am skip reason: change_id I4da25d351f6c780f17c7ad79ea239c9a535f5c9a with SHA1 957088030c is in history

Change-Id: I8516c7b6d1498a703f37da1cd80485bad22ed020