Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am: 7705d5fd6e

Change-Id: I9a478a5dd666c8c938206e888065dbec976a9e82