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

Change-Id: I996ac7dfaee8a169b35f912abeadc94017151b52