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

* commit '263b6cb6e3aa949a689ab532361f065a6dd3ff30':
  Add more logging message and dead code