am 0b179b87: am ed9b05ac: am 263b6cb6: Merge "Add more logging message and dead code"

* commit '0b179b87ab0ca769afae12deb625b845757c6392':
  Add more logging message and dead code