Merge "trusty: storageproxyd: Fix rebase of UFS support"