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

* commit '12b6dc0063409015827938c54237beb2700b6cad':
  Use American spelling.