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

Change-Id: I71c4dae7d7955a8676cec1d669dc2375fdcc03a0