[automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev
am: 8702c1454d -s ours
am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA1 80ec50b8ae is in history

Change-Id: I34770e7d4fe3dcde9f8f41eeedee93053049b0bd
tree: af9ffa8438def3e7233d595d436c39eba014435a
  1. tests/