[automerger skipped] Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" into qt-qpr1-dev am: 724b363703 -s ours
am: d0c24ded26 -s ours
am skip reason: change_id Ibc2bb3a04ee5605660ff4f2cf762af499db237c8 with SHA1 70ff3fb971 is in history

Change-Id: Id211f4a3352717bf474eacf33a889d3f8203548e