Merge "Temporarily add debug logging for b/31357497"