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

Change-Id: Ib21c14421ca5a3c102e320389f61fbc6dd380f8a