Fixes how None is handled in aggregation

Change-Id: I96c06722a1e9a1f0d23ca0099ee4f2d0edc4a45e