[automerger skipped] Merging from qt-qpr1-sysui-dev @ build 5855545
am: bda95478ac -s ours
am skip reason: change_id Ide60b1927a5f1130a950e87843deb578b494f95c with SHA1 2d2d432c13 is in history

Change-Id: Ieba5b108d4543f0937c1ee43d85bc9e89ce877df