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

Change-Id: I907457f6746efb24a482f4c826875bec26813198