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

Change-Id: Ic6ee0fdc207453a39c7b463feba86f8f3714f0ef