Merge "target: include: Fix for UFS support"