am f020d610: (-s ours) am 5e073960: DO NOT MERGE Avoid race condition that...
am f020d610: (-s ours) am 5e073960: DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
* commit 'f020d610':
DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.