am 2bb8dde4: Merge "support the people extra on the notification object"

* commit '2bb8dde44be10212ec453d435aaad27177714f5e':
  support the people extra on the notification object