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