Merge "HostTracker hosts DB key scheme implementation"