A shot at fixing bug in parceling of EntitySet

We'll need to keep watching for this bug, because I could
not reproduce it.  The fix is just the best guess after
and armchair investigation.

Bug: 2498937
Change-Id: Ic42cecc5ce79504e645bd07fb80d3ac0f53b3bed