Fix unit tests am: 968e41783d
am: e2eabf01d6

Change-Id: Ia9ad0bd3fa99986d27cb45b23e0bedb38246f21b