[automerger skipped] DO NOT MERGE: Import platform SDK from build 5531200 am: cd000f8449
am: 91e8d20b4a -s ours
am skip reason: subject contains skip directive

Change-Id: Ie16432578b1382c371733dd7a54ac4b4446fc47b