[automerger skipped] Merge changes I98573a5c,Ic7394f24 into qt-dev
am: 3b5424047c -s ours
am skip reason: change_id I98573a5c68e45abbbaddef01f6ac74a6a18e26f9 with SHA1 0fed3d2c01 is in history

Change-Id: I80f0924a1a1f83962c6dee7fd937a341075327e4
tree: 1a18485f6e22a5fd89acc780cc629733f2506f05
  1. core/
  2. services/
  3. tests/