Merge "Remove tests already covered by CTS." into qt-dev
am: f6ca3f4e8f

Change-Id: I353661f089afc6d0f6615334ae1062145a93e6d9