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

Change-Id: I116d4bd532751159c59f8178dead7503e562af85