Merge "Tethering: replace argsContain with CollectionUtils.contains"