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

Change-Id: I3fe5c7c0baf273c9960a56640cd659abd990b858