[WIP] Perform currency fallback earlier

Authored by awight on Mon, Mar 20, 11:58 PM.

Description

[WIP] Perform currency fallback earlier

This allows us to validate the changed data.

Change-Id: Icf39eeb26860f58ba5244b36d01dcac060c81027