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

Change-Id: Iac74be908685c9d16c39a3178312eef091c7946c