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

Change-Id: I1ea31c0defb8b00a9b15545a826210680de6fbeb