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

Change-Id: I5083217a4c23ba223a02774ab071f0edfb7079b6