Merge "build: Fix intermittent build issue"