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

Change-Id: I490421dd7f13deda634b669ca7b7bd7a51d2bfdf