Merge branch 'stable-3.14'

* stable-3.14:
  Fix flaky issue validation tests

Change-Id: I0d5c6224066fbc27ca9b145c0078571653684872