Merge "set zero shutdown timeout for eng build"