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

* commit 'ed9b05acba1586dda4ad8bfb1213aa33cdf20564':
  Add more logging message and dead code