Fix call grouping

Change-Id: I187b0b7c625ff4af777ac028d98ad0c1f8aaf713