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

Change-Id: Iabcac8a4597e2913d461cafa179a8a79ce0e48d9