Merge "Search both CE/DE storage when clearing caches." into nyc-dev am: 128074fcb9
am: b72f355dca

* commit 'b72f355dcae8cfaae6e8de6f65aa52c2199d666c':
  Search both CE/DE storage when clearing caches.

Change-Id: Ibe4e9939b186423aaed93c5acb6281d2804ff25e