Merge "Fix google3 migration issues" into pi-car-dev