Merge "Changes to kernel attribute: 1) Recognize an optional string argument. 2) Ensure the attribute is only applied to functions."