Merge "Fixes test that is currently failing" into qt-dev
am: 20a2e7ae2f

Change-Id: Id78942cc57c075f983984bb39da969e505938781