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