Merge "fs_mgr: overlay check shared blocks for / if /system is not" am: 3569a8817d
am: a309f1b065

Change-Id: Iefcae97089003ae14991efd8e3de41b40181b0d7