Merge "Small updates to test Copybara as a Service" into pi-car-dev