Merge "Clear cached files on external storage." into oc-dev
am: 4b567487b7

Change-Id: Ib979f876c37632b723e6a982dc48ec746aaef290