Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev am: b8028f63ec
am: 64736b6ae1

Change-Id: I7267309d17ae503144eb11789888937af6c8a0e1