Merge "Fix return-stack-address warning"