am 13ced23c: am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev

* commit '13ced23c496be6b22e1f0484cd96ffb65ab5bfe3':
  Tag Notifications with People (Email)