[automerger skipped] Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev am: 05b2c6883e
am: 2434ea7e30 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifc3749bee8af814819e0a7b329d56c01e70895ef