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

Change-Id: I20d885ee7f12821885767a13cafac6c3dec4ba2d