Merge "reorganize trusty_metricsd settings" into sc-dev