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

Change-Id: I4df82170e4d9f4661ae1ef8df384cc45dd6e6920