331ef6127c
* commit '32779536bcd66d45019f4ab80dd0d844e618e16b': DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050