Merge "Merge "Add 32 and 128 bit Service Data parsing." into oc-dev am: e2b92e904c" into oc-dev-plus-aosp