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

Change-Id: I2d3547407efc9cab3f87b04b8ff29bde6b8d31c0