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

Change-Id: Iab64ac27f20c758b1bcdcd9dc055b1177b91d3ce