Merge "Add metadata to config_gen"
am: 71e6a6cbe8

Change-Id: I4b7cc0fb708f4f074e4aa2e9572325312bd0ead8