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

* commit 'f24ee13254b544b7e73ea1b28facc1996b8185ab':
  Add debug for 12987986.