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

Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Change-Id: Ieea5138da3d182735fb92eedd607f52750c91e19