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

Change-Id: Ic21a3257681469b11b88288a1d05346a713a8a25