am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev

* commit '6d630c7575f9e33632acf398201ae4226ce800ed':
  Fix parcel issues with empty service uuid. Added tests.