Merge changes I9bbff5be,I270b751d,Ibf1bd267

* changes:
  Remove unused import and reorder the import
  Add debug logs for error cases
  Add KeepaliveTracker.Dependencies class for testing purpose