Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545

Test: manual; presubmit on source branch

Change-Id: Ibc2bb3a04ee5605660ff4f2cf762af499db237c8