Merge "Keep shared downloads when apps are uninstalled." into oc-dev
am: ace6b8812e

Change-Id: I515b9664ca70dac452bd6d0b92b29de8c1dea82a