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

Change-Id: If8935d66d787891d64197ee5d17e08cb702a4bc7