Merge "Added a tombstone comment to WANObjectCache"