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

Change-Id: I73cd94356d43ce732d4b82392601dde62fa504b2