am 5944c3f0: am 12b6dc00: Merge "Use American spelling." into ics-factoryrom

* commit '5944c3f0427e077f214ffa8b0193e430aeef9b68':
  Use American spelling.