Merge "Return 304 for not modified SmallResources"