am 97c50d70: Merge "Tag Notifications with People (UnifiedEmail)" into ub-gmail-ur14-dev

* commit '97c50d70a4f1a9bf1952db03444e31f3e0e0b803':
  Tag Notifications with People (UnifiedEmail)