Merge "Enable field watchpoint tests"