Merge "Increase timeout for pnda build"