[automerger skipped] Import platform SDK from build 5716442 am: 7984eb5059 -s ours
am: ff01873f07 -s ours
am skip reason: change_id I82a1283080c5d21fd20ae937616f537275fd6714 with SHA1 81a2e393ce is in history

Change-Id: I0953877966c380b8cb306e43eca9a9d06bf167f6