Merge branch 'stable-3.1'

* stable-3.1:
  CreateChangesTriggeringGc: Fix test timing

Change-Id: Ibc662e16aabf84280692d23ff57ae7cfd5e18060