Fix unit tests

Bug: 4946097

Change-Id: I9de5afe10931938d945c057e658072944c7308f5
2 files changed