b4b66d2f
* commit 'b4b66d2f3afe8154efeb86389bc47c046d21aecf': Move advetise clean up to callback code. fixes b/13289050