flax

1d3a2eed - Merge pull request #5006 from google:variable-refactor