Merge "Clear ThreadLocal storage from Choreographer" into nyc-dev