Merge "Fix unit tests" into pi-car-dev am: b9d80a56fa

Change-Id: I5bcbbd6bfd38194bb189571fe8076c83e1df588f