
More fixes for tests run on a farm

R=marcosalmeida
DELTA=27  (11 added, 9 deleted, 7 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=101


yamadatomonori/closure-library,yamadatomonori/closure-library,yamadatomonori/closure-library