Merge "Delete flaky OldSystemTest.test_gc()"
am: 4fea8a955f

Change-Id: I077f615dd39088b658c038d18cb4d616f569888b