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

Change-Id: Ib4c0e8a897a2e5b4afbd95a231c60f6442d3b315