Merge "Load fallback categories earlier" into pi-dev
am: d688e7b15d

Change-Id: I863c71a204d87e6d91229f553986efd708722324