Fix unit test failures

Change-Id: I1d66a0124961d524f83f7895a2c09e0ee2c1aab4
1 file changed