Merge "Fix deprecated calls" into pi-car-dev