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

Change-Id: I589ca1d45faf7cb9e9e40bba7cf1c8aa1156cef3