Merge "Don't remove OBBs when clearing app data."
am: 105e189e41

Change-Id: I831abb95671588a17e4c69b506df955280e573c9