Merge "Workaround bogus Thread Safety Analysis warning"