am 0250416a: am 78c951b2: Merge change 23704 into eclair

Merge commit '0250416a8fc49693772205eaf521ece544b29757'

* commit '0250416a8fc49693772205eaf521ece544b29757':
  Fiddle system boot ordering.