Merge "Osu: fixed Mismatch between createFromParcel and writeToParcel" into oc-dev
am: a13c8187c8

Change-Id: I5ffcd6ba62f2c085f2a9929fadd0366238c9183a