Merge "Cleanup after updating Vehicle permissions" into pi-dev