Merge "Added changes to allow single parameter to scan facade's method setScanFilterServiceData to accept single parameter serviceData. Cleaned up every instance of scan in advertise facade to avoid confusion in logs." into lmp-dev