Merge "Reduce the coldboot timeout to 1s."