Merge "Removing an extraneous test" into qt-dev
am: 16b2c77456

Change-Id: I2c85512e101ad9cdb5118316e39e7a7a6011f6c3