Merge "Small updates to test Copybara as a Service" into pi-car-dev
am: 5c7fec75f6

Change-Id: Ie04c91c2eb3bd906de091a7f218eed2fc5909ba3