Merge "Fix google3 migration issues" into pi-car-dev
am: 0ff9227390

Change-Id: I8dbd48b983f860178a7593473b62e12871f1f03b