Merge "Reduce memory usage by some extractors." into oc-dev
am: fc59a24fa7

Change-Id: I904bdad33c2bcfed20cca9f4e5a1eb972bfed20e