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

Change-Id: I1829438c711c76ef2ff585c8ec75a5baf9e88213