Merge "fs_mgt: Fix remount failure in case of non-overlayfs system" am: 09bbdcb6b3
am: 8e54c6e8c1

Change-Id: I7a00b43d50ef28e425ecc643e18637ef1cb3f465