Merge "Fix nativeProcs being null."