Merge "Remove legacy advertiser from map after it's no longer used"
am: 42b1578867

Change-Id: I8f6f49f0d75c840faa8a7dbdb56a1debecd28d97