Merge pull request #1322 from lz4/minor1 Minor refactor GitOrigin-RevId: 77e54ea5f900e1f56655ce65ac9cf989fad4b502 Change-Id: I7c1fc4385e2e90d024fe4ec0fa19ab11fe8d21e1