DO NOT MERGE: Fix unit tests

Bug: 13584402
Change-Id: If2930f7f3a0d4eecb829cc531b871579ea988f6f
1 file changed