Merge "Framework Tests Cleanup: Removing CTS duplicate files"