Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev am: 589c217580  -s ours
am: 7813730868  -s ours

Change-Id: I8bf19fcb8a246ac80405c54baa5afd250bec211c