am 624181af: Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom

* commit '624181af38f7f9e4fe4a18ca3e15204f30609312':
  Settings are restored in alphabetical order rather in order of dependency.