Merge "Fixes breaking test" into qt-r1-dev
am: 4c1435a8eb

Change-Id: Ied67a3823b917b7e64cdf80c09472a50de70a9fe