Merge "Add @RequiresPermission and fix API naming"