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

Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e