[Cherry-pick] [Closure] cherry-pick 2 commits from master to fix closure issues and add closure-specific attribute callbacks

[Cherry-pick] [Closure] cherry-pick 2 commits from master to fix closure issues and add closure-specific attribute callbacks #127718