Merge "Add debuggging for 10858941." into klp-dev