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

Change-Id: Ic44966a40848d8ad169b97475317d43dcafb3142