Merge "Fix memory leak of DataSaverPreference" am: 7a65c7f279 am: 64ee868ff3
am: b9af110c03

Change-Id: I07aae53bbf708317cc4ca60926c27c22d37c2179