Merge "Don't drop as many caches when evicting CE key" am: a057b27f2a am: a30a907c65
am: d019a2950a

Change-Id: Ife774c53715171272ea1e3db36f3ddedaeb8a2d9