[automerger skipped] Merge changes Iba1c82b0,Ia498f6dd,I16fd11f5 into qt-qpr1-dev am: 40f8906f am: 80cf46d6
am: 0dff6354 -s ours
am skip reason: change_id Iba1c82b087533cb87a32d69f7d6908e2c925b807 with SHA1 5c103f29 is in history
Change-Id: I08d94c3782fc1cd1e09d0c6464b36a5d958ddaf5