Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212d am:...
Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212d am: 2acc8e28" into nyc-mr2-dev-plus-aosp
am: 658e1ddc
Change-Id: Ibe20b5786d5155d2e319c3c0620d1da64cbe14e6