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

* commit 'f8ae0f7bfbaf7619bd91d4bb60e9aebb062199d2':
  Tag Notifications with People (Email)