Merge "Add @RequiresPermission"