Merge "Add debug logging for b/10689184." into klp-dev