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

Change-Id: I9e8645c808d1b1cbee242e8a953be93fbf71e4e1