Merge "Fix UnimplementedEntryPoint initialziation."