Merge "Fix CtsFsMgrTestCases failures"