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

Change-Id: I9f7936aeb38e472acbb1246ff160a4ec20aba419