am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev

* commit 'd3df99c474b8e267cead8382912b083b6f6ebe3d':
  Add debug for 12987986.