Merge "Cleanup dynamic config in cts" into nyc-dev am: 3e53709606 am: a55c585431 am: 8cd0932ead am: 9b20c54fb9 am: 4929926083 am: 77925927d3
am: f6c7c6539b

Change-Id: I34c74edc843be8cb7309ebf547f03bdbb09e25c5