FLAGS are now called CONF

Change-Id: Ia182784df1873af6fd1f41e6abef6df9b16b11bb
Merge "FLAGS are now called CONF" into production