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

Change-Id: I0e45d40a6a134de072edbc2c05723d0f36e3e409