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

* commit 'ee16b2c23cd787f0f60e81a3b2704ceb3d9f4f6f':
  Keep Parcelable CREATOR fields