Merge "fs_mgr: fix checking for casefold feature already enabled" am: 154bd7e031 am: 06f8bd9e37

Change-Id: Ifd74636b63b652ae774e762171bfc3dbe91202c5