Control node build fix

Change-Id: Icd3d09489cfeafde3b3de91f5cdcc4ed0364b824
Merge "Control node build fix"