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

Change-Id: I5a0427d1a4c8377d47a068d5feb98bb217a5eab0