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

Change-Id: I1f4439feb857637c32e5504e2578e4abef3adcee