Merge "Removing static reference from sUnknown"