am 86920d80: am bca8dc6a: am 000c009b: Merge "Reduce the coldboot timeout to 1s."

* commit '86920d80b61f6793de0608dd2d8db6222e051d95':
  Reduce the coldboot timeout to 1s.