include: Merge oppo changes