Merge "Ignore service UUID length if no UUID filter is specified" into lmp-mr1-dev