[automerger skipped] Merge "Osu: fixed Mismatch between createFromParcel and writeToParcel" into oc-dev am: a13c8187c8 am: 8720a5e1b7
am: b3e9029c91  -s ours

Change-Id: I64bfb8fd033d5d4482b7c2f322089a78d2226fb8