Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into...
Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev am: e3e2dd33 -s ours
am: 2f15a563 -s ours
Change-Id: I292355f59b73a0c7d4347f69fa5f8911a6a98d6c