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

Change-Id: I36f57cecb681f8423cf94312720d3eb0536d0c0b