am 5e01b4e7: (-s ours) am 67b95840: b/3064553 Fixes group by to allow diff types. Do not merge

Merge commit '5e01b4e74f83e6f2be4208bba43e22eff78125c2'

* commit '5e01b4e74f83e6f2be4208bba43e22eff78125c2':
  b/3064553 Fixes group by to allow diff types. Do not merge