[automerger skipped] Import platform SDK from build 5608928
am: 34b07dc9aa -s ours
am skip reason: change_id I4c0cd893da72b08b0a13979e9673d965eced5403 with SHA1 c9d1072841 is in history

Change-Id: Iac8853c5e45a1f1c0dbeeba863f3b8eaae43d3e6