Merge "bluetooth: V1.1" am: 58b3a47b89 am: 57ab4a1db2
am: 4fd666d86a

Change-Id: Ice95085e625ffb90db8efb0411fb70437093d41c