Merge "Bluetooth: bluetooth.le API fixes"
am: cf95973276

Change-Id: I67075df5e7d457cd85b40faefb3fe68946775330