Merge "Fix LE filters for 32 and 128-bit UUID service data"