Merge "Clear preferences when package is removed." into nyc-andromeda-dev
am: c2a24c45b8

Change-Id: I15fe9f6e8a0b1ff6736275a6d8b525e89dd957d6