am cd5b7920: am bc7f8a79: Merge "Do not keep struct state on the stack."

* commit 'cd5b7920395f00c767d57c096dfcd713e9e25326':
  Do not keep struct state on the stack.