Merge "Fix remaining file related CTS Test failures."