Merge "Fix misc issues with non-generated-code fault handlers"