am c448f7c8: (-s ours) Fix BadParcelableException in intents

* commit 'c448f7c812ccb4d5d6db550ba2ed41b8cd1afd06':
  Fix BadParcelableException in intents