Merge "Converted ChangeTags to using the WAN cache"