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

Change-Id: I146f0925e1b9c68e2cd04d76897a59fe87ac741d