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

* commit 'cf88432368501b446716885c5c656f7176abcef1':
  Fix BadParcelableException in intents