Merge "Use static final debug fields."