Merge "add component metadata to all CTS module configs" into oc-dev
am: 43596249b5

Change-Id: Idaada8414d62bf7d84d40b532ec7464e7230bd37