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

Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2