am 401e9bd3: (-s ours) am 307c977d: DO NOT MERGE Avoid race condition that...
am 401e9bd3: (-s ours) am 307c977d: DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
* commit '401e9bd3':
DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.