Merge "fs_mgr: overlay drop redundant check" am: 5c61dbd12c am: 3646a4ca5e
am: f17c9861e4

Change-Id: Ie85ca844944feebc58f591e3324eaf1fad7c7fcf