Remove ThreadLocal references from CurrentInstance (#11914)

Change-Id: Ic7389a06726026383b96de80b0d038ed11e9d273