Merge cherrypicks of [7817297, 7817453] into qt-qpr1-release

Change-Id: Ic787c25903adab382543dcc529cd0de80608a9aa