Merge "fs_mgr: fs_mgr_has_shared_blocks() needs logical blk_device" am: b7d9b6a995
am: d5514f3d6a

Change-Id: Ieccd72fd76a9c26d28aaf58a9e768afbd1252c79