am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev

* commit '972a985590266e457d4a13400dfb5797d7b85908':
  Yet more debugging for 10858941.