Merge "Add permission check and @RequiresPermission annotation"