Merge "Clean up in Car*Manager" into pi-dev