Updated config generation to reflect updated design
Updated config generation to reflect updated design

R=mgiuca@google.com

CL=340857013

chromium/caterpillar,chromium/caterpillar,chromium/caterpillar