Fix broken tests

Test: Run robo test
Change-Id: I0d466e95c8d63703e05d5b6f0e2a81e43b468ed7
2 files changed