Merge "Rename resetInternalState to resetInternalStateLocked"