Merge "Revert "Upgrade build node and inc build timeout""