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

Change-Id: I1e9b8c713440aee1f4154554a9eb53665b7dab19