Merge "Fix reduce_allocation()." am: 7d845bafe5
am: c32774f81e

Change-Id: I58b9a58d1e6b71da1f0c620afa2371f0cfcf2896