Merge "Increase timeout for loading archives in tests." into arc-apps