Merge "fs_mgr: target-agnostic device-mapper helpers" am: a6a266af00
am: 752cd746fc

Change-Id: I95502ba83278fee9480c4476f55f8099276b237b