Merge "Fix testKeyValue_Concurrency flakyness" into qt-dev
am: 52f7022db3

Change-Id: I75528ec631c9b13e784b9543df25f7a31321e4ab