am 888d45c8: Merge "Fix a couple ad bugs" into jb-ub-mail-ur10

* commit '888d45c8a3bc82289fbfb2660e69c698ea18882f':
  Fix a couple ad bugs