Merge "Fix issues preventing Google3 sync" into pi-car-dev