Merge change 23704 into eclair

* changes:
  Fiddle system boot ordering.