Fix Chrome OS unit tests am: 9131f6c360 am: 81be8b2dde
am: a60fc2554c

Change-Id: I336317352cc8b272869b01279ded943018631f20