Merge "Test updates for I044ac25a19ba5b7fd0ee470ca0a13dc65cbd2679" into qt-dev am: 030535d710
am: de2a23c008

Change-Id: I9fe30a2163bb6889089479048fdb515ed6d664df