Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging...
Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
automerge: 54f9b1ee
* commit '54f9b1ee':
Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi