Another big scary patch - DonationMethod

Change-Id: I3a09af2cbd8566bbeb431437c49e72c832b87304