Merge "Have unified setter/getter for TSMS Settings." into nyc-dev