Merge "Fixes a stack-use-after-scope sanitizer issue"