Merge "base: work around thread safety analysis bug."