Merge "Skip some unnecessary allocations" into sc-dev