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

Change-Id: I71782554db964d33820a4ee68ae766a05c39266f