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