Merge "trusty: storageproxyd: Fix rebase of UFS support" am: 369dff24da am: e6282d9d33 am: 6e66597cf6

Change-Id: Ibf16ccfa4c5a1eb054f6fd6f4d556d8355bb7c40