Merge branch 'stable-2.15'

* stable-2.15:
  Fix check for group index in GroupCacheImpl.ByIdLoader

Change-Id: I99b1a7522f7a62f10c8ee7f5bb4720be39a71ca0