Merge "ScanFilter.setDeviceAddress: Should send deviceAddress instead of mDeviceAddress to the next level"