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

Change-Id: Icc8449c663d6fd97c8f8aff13afad936534a39a1
tree: 2731cd4678b8132528aa5026d47c2ec872a64dc0
  1. tests/