[automerger skipped] Merge changes I261ad35f,Id2611b3c into qt-qpr1-dev am: d76cc783f8
am: 434b36ec6e -s ours
am skip reason: change_id Ied7d97d4b4b0955981824d7342aabe74d06a0c1f with SHA1 6cb2feea7e is in history

Change-Id: I0edceda48793dd903f2e06edaac358d8c15377f7