Merging from qt-qpr1-sysui-dev @ build 5855545

Test: manual, presubmit on the source branch

Merged-In: Ibc2bb3a04ee5605660ff4f2cf762af499db237c8
Merged-In: I5a0abda9ff5f85ceaaa20d3e145a207add7a4b53
Change-Id: I80283c2e935b4df3bc8b039d68d4830083513faf