am 1ed7bedc: am 2f0743cc: am 2395a936: am 56d0e14e: Merge "Updates in support of Email Tombstone app" into ub-gmail-ur14-dev

* commit '1ed7bedcd94c063ed874f5173cd66835dae8b1ca':
  Updates in support of Email Tombstone app