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

Change-Id: I9dca0c59e2469cf187c3a4dcaf4ec203a98e3ab0