am e623fa22: Merge "Preserve advertiser name" into jb-ub-mail-ur10

* commit 'e623fa221d73a5337b2fb38f1bb501ee8a3f4b10':
  Preserve advertiser name