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

Change-Id: I8d2ff18d1c6c8c337b1aba9e6207f6cd66003ea6