Merge "Make the tests permissive for Q" into qt-dev am: 822a98b55f
am: 0d7abdddef

Change-Id: I54dcdb09c53d1963d95c021b5683fc9273df46c6