Merge "Increase fastboot timeout to 30 seconds"