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

Change-Id: Ie141acb8b6a5037cbf2d1670d71b8029e08f028c