Config intelliplug to build/fixed cherry pick conflict in intellidemand.c