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

Change-Id: I33c9bfaf4207a5e3bc8e7601d5b6649c891bea8f