Add missing CONF define.

Change-Id: I9408b3d1cc07a9bcdd6b4ae6c956cbba1fdfaa29
Add missing CONF define. Merge commit