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: I94a81ea270037bd5fc7420a52819421125fc5b5b