Merge "BLE OOB Pairing - parse address type (2/5)" am: 2258384020 am: 2b64b02443
am: 06474814f7

Change-Id: Id65d98f4c22f416bc20dc5bc89cf059f92afa672