am d095d867: am 0628fa25: Improve boot time

* commit 'd095d86705a42186c906db58486575b2d9060de6':
  Improve boot time