Fix broken test cases

Test: Run robo test
Fix: 127602715
Change-Id: Idec3351b76801de98fac502ea59b2396a60df937
2 files changed