Merge "Cover InheritableThreadLocal with tests."