Merge "Fix memory leak of DataSaverPreference"
am: 7a65c7f279

Change-Id: If0cc15cc83afde74a2cd694924fe5af8cf124c8b