Merge "Support associating with an already-paired device" into oc-dev am: c041c7a34e am: 99f209be12
am: f623be339c

Change-Id: Idc42c2e44c70e06dd56cd8a556ce91fb3cb10cea