Merge "Use Java7 diamond operator in TSMS." into nyc-dev