/host_cache_messages.cc          -diff merge=ours
/host_cache_messages.h           -diff merge=ours
