am 85b4ee5d: (-s ours) Merge "DO NOT MERGE: Send to local UUID for AV connection" into klp-wireless-dev

* commit '85b4ee5df4208fd06e836f40d7a19a84545f4e93':
  DO NOT MERGE: Send to local UUID for AV connection