Merge "More debugging for b/106899184" into klp-dev