Merge "CTS: Change patch cwd"