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

Change-Id: I59e51d916e3a4dc6aefab2d41a0ad06a473fef1d