am 56d0e14e: Merge "Updates in support of Email Tombstone app" into ub-gmail-ur14-dev

* commit '56d0e14e696954d6fe27ff03c2ca216816969162':
  Updates in support of Email Tombstone app