Merge "Fixes for CtsCurrentApiSignatureTestCases with DynamicConfig" into tm-dev