Merge "Add storageproxyd UFS support" am: e4d95b77d5 am: fe553d0f11 am: a9508eb591

Change-Id: I295a4a15474b99c1b067504c13f0aa8aa2c94aef