Don't repeat --config-dir option twice. Related-Bug: #1492069 Related-Bug: #1599936 Change-Id: I002b80ba8e5496c164d08357e4cce9e0b4abf5cf