Merge "Reorders arguments in Context Hub Service methods"