A bug which would have affected amazon payments when payment_method is set.

Silence some warnings.

Change-Id: Ie51f015adefd4a4b03f8aae19ded3137b48fd437
Merge "A bug which would have affected amazon payments when payment_method is set."