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