Merge "Fix compile issues after Google3 migration" into pi-car-dev