Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6
am: f59ad8bd68

Change-Id: I8307894e80bdfc1c260708c7174d294178ffa00b