Merge "Refresh payment preference while resume" am: 05650bb3da am: 088baf348b am: f523ca10aa
am: 84a60e3cf3

Change-Id: I037f72265acc57e531edc337e3e523ece20063a3