Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
am: 2acc8e28dd

Change-Id: I54a5717690a43e03b2390e1413e06e9c35554e28