Merge "Bluetooth Multi Connect" into oc-dev am: 3c0f1f1aa2
am: 6afa6847f8

Change-Id: I4689a4a1db515491af5f42f42c96c7a976950487