Merge "Allow @RequiresPermission to be specified on parameters"