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

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