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

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

Change-Id: I3307902105a26d0a3f1b0c4a59a499d0dcac88e3