Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd
am: c6d5902

* commit 'c6d59023709b7e86db3b07b5e8b99c34b25f3c29':
  Default payment settings to disabled

Change-Id: I075e3be940e4cfec1582c1d4a928a269327f2431