am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields

* commit '2452774c0be2d6ebf2d433045d172787c90772ca':
  Keep Parcelable CREATOR fields