Merge "cancel group children before summaries" into nyc-dev am: 6392db9
am: 742546c

* commit '742546c2d29f04a5afbb2c459c7a1e8e20167571':

Change-Id: Ibbd8466beaa1c7408a49b7c938f1c4ffad84b864