am d2ea737a: Merge "Remove leftover debugging code"

* commit 'd2ea737a1f28b43ce2e01686d64a5cf8243daa49':
  Remove leftover debugging code