Set intellidemand as default

Change-Id: I71dccaa2073ebfdbfedee79858d5c4492b89db81