Merge "Add annotations and finals to PermissionInfo"