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