DO NOT MERGE ANYWHERE - Clear preferences when package is removed. am: 20488d97cd  -s ours
am: 672743596e  -s ours

Change-Id: I211d2837cf22c547c65b26127171c82f3fdacfa6