am 62eb51af: Keep Parcelable CREATOR fields

* commit '62eb51af23b5f0ac43a8f596582d469fe5e3a375':
  Keep Parcelable CREATOR fields