Merge "Fix CtsFsMgrTestCases"