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

Change-Id: Ieda87ec6f8958d11b36cc48fab83233c687a254f