Merge branch 'stable-3.5' into stable-3.9

* stable-3.5:
  test: Remove duplicate JSON parsing

Release-Notes: skip
Change-Id: I7d818f810668ec880587cdc84e7f6b9db70b89de