Merge "Remove unneeded @RequiresPermission annotation"