Merge "Update summary for AllInOneTetherPreference accordingly"