Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread