Merge "Add thread safety analysis annotations."