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

Change-Id: I17679cfa264f5ea4761b9a40867f4bbe1817b36e