Merge "Fix breaking test" into qt-r1-dev
am: dc40ca591f

Change-Id: I1ac76a785da3b9084f83b334a455d0c6f268b32d