Merge "Add storageproxyd UFS support"