am 479ec682: Merge "Fix "argument list too long""

* commit '479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
  Fix "argument list too long"