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

* commit '000c009bcc71bf8218d20c5575d3ae44c8bd4cda':
  Reduce the coldboot timeout to 1s.