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