Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
am: 05b2c6883e

Change-Id: If370a9a0be7c78dc09fd49ede94b347a85d974dd