Merge "Get rid of unneeded allocations in Extract...() APIs"
am: 18f25d399e

Change-Id: Iedf41c02dc7b1b92ba781d59f71f1e8e6729ffcf