Merge "trusty:storageproxyd: Add ufs to parse_dev_type" am: d363769dcf am: 22ad80da60 am: ebbc388197

Change-Id: Iaac6df89e59ba939b4a64a41854ff36b3e89c992