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

Change-Id: I4a40f423189241227aa11711ccca5a31d4520551