Merge "Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684 am: 9cc225e482"