Merge "Allow staging images only on OOM staging branch"