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

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

Change-Id: I259e45be3069e8830f574faaa98f6aa8d0924e89