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

Change-Id: Ic67b2c1b4d6658ffced0f8280097465190ff6f6e