am 64ee95a3: am a499a2ad: Merge "Fix aggregation exception problem"

* commit '64ee95a3e48d6f83e338764650c53a915b778cdf':
  Fix aggregation exception problem