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

Change-Id: Icd591113ec3587f034557559ba1d5e4a24c86f7b