Merge "Add storageproxyd UFS support"
am: e4d95b77d5

Change-Id: Ib3fc9b2f20e207985c4580c6779361cfbaf73bbc