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

Change-Id: Id5d4f830522b9742c42a8f4371393072a4596770