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

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

Change-Id: Ib488ef9ef352478e8352c9f7e88c832eda484ad3