Merge "Make test 906 retry to avoid gc races"
am: 1f27e6defe

Change-Id: I465e88c42b60d4883363acc737b86a213a750670