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

Change-Id: I8878ee2da3fe3e1afad7079490162cdfe0487327