Need at least one pair of (gross amount, currency), or the "original_" fields.

Change-Id: Iddf01d7cde8dcace7d870e586351074f11914d48
Merge remote-tracking branch 'origin/master' into HEAD

* Need at least one pair of (gross amount, currency), or the "original_" fields.

Change-Id: I2ee4e08c56a561eec23ef401d723544bc09da08d