Merge "project: apq8084: Enable UFS"