Merge "Fix broken tests" into qt-dev
am: 1115d61c0b

Change-Id: I16026c2a7306fecb02230d1403f31efd50e297e2