Merge "Add metadata to config_gen" am: 71e6a6cbe8
am: 632e337064

Change-Id: Iaa1d054982a339eddbe81b74d509d08855377dad