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

Change-Id: Ib4fc2d7cd079d6a45b606dbe121e1706c1c9b9d9