am 34c40cab: (-s ours) am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050

* commit '34c40cab3e2bf12db6fbb941573f026376ab71b1':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050