Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa0 am: 4d813757 am: 3af7698c Change-Id: Ie554f178d2d1033d0386d460544bdedcf6ff1f1e