Merge "Revert "fs_mgt: Fix remount failure in case of non-overlayfs system"" am: ae898442d1 am: 53fd244944
am: 843c83abca

Change-Id: Icba1efeb123287d64064775cf70ff5c2b04ad0b4