Fix unit tests. am: f5a49018a5
am: 2e2831a1dc

Change-Id: Ieaad14415d186e4ca7bbcaf70c20e3434a067557