Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
am: 271e0aa02a

Change-Id: Idddaa69cc89caaebcee0be1d4d27e28e2fd8ea51