Merge "Add 32 and 128 bit Service Data parsing." into oc-dev