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

Change-Id: Ic79b1a752f6c2a1083a2222afa6c2dbfbdaf9f3b