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

Change-Id: Icab2052bc0d0778c82f136962b679ebbfa96b045