am 78c951b2: Merge change 23704 into eclair

Merge commit '78c951b286ad6fc5300e2d30a624b7e9963202e7' into eclair-plus-aosp

* commit '78c951b286ad6fc5300e2d30a624b7e9963202e7':
  Fiddle system boot ordering.