[automerger skipped] Merge changes I9a0bf442,Id4c7c086 into qt-qpr1-dev am: 20fd656400 am: 572efe14d1 -s ours
am skip reason: Change-Id I9a0bf4428774b13cc6414a223f378e09341a6a55 with SHA-1 3a662d08d0 is in history

Change-Id: Iabe960adc90942ad2fcfffdbf4bdde2d9d8ff859