Merge "Recover from HandsFree client connection collision"
am: 3081c2e81a

Change-Id: I9cddf7fc2a827b20f18393ff62d1cb3fd0032320
tree: b9fa351036d2085c82e1dd29638e55f33f592e87
  1. embdrv/
  2. NOTICE