Fix Chrome OS unit tests
am: 9131f6c360

Change-Id: I7e5a4918f7f55d944830eddefcb6044cbdf89c4e