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

* commit '6392db9df7ca1a809ff882e0792bf7fbc105ce96':
  cancel group children before summaries

Change-Id: If19f0a460346287c66f21db5f890934fef7a2eca