Merge branch 'stable-3.2'

* stable-3.2:
  Adapt to GroupReference interface on latest stable-3.2

Change-Id: I33b4c545352a7cf4c503a1dc1228aa007fdf8418