Fix device selection when android_payments flag is on (bug 938716)
Merge pull request #1436 from muffinresearch/fix-device-selection-938716

Fix device selection when android_payments flag is on (bug 938716)