Merge branch 'stable-3.13' into stable-3.14 * stable-3.13: Fix flaky issue validation tests Change-Id: Ie0e40f5c334d9ef631a8d6ce2942b74cbb921a99