Merge "Clear ThreadLocal storage from Choreographer" into nyc-dev
am: 39f1311b

* commit '39f1311b545f1f8732ee3a8b565018dcd0da7323':
  Clear ThreadLocal storage from Choreographer

Change-Id: I6245cf707bc5449df2d729af4f89923223aeae93