Merge "Make test 924 less flaky."
am: 3b3df4d5d3

Change-Id: I5aabcb0d8f99608b19c440e0356ccee1c3ff989c