Merge \\\"Add non-parcelable extras to notification to make sure it does not crash the app.\\\" into nyc-dev am: c72edd7a89 am: 677eb31ed4
am: b1d40eb3c0

Change-Id: If24d2cbe8cdbd544781a3d4da9f89ef596f936f4