Merge "Optimize test cases" into qt-dev
am: b55034da2b

Change-Id: I6a52f6a28a93e56a3e6700f2bf95a93b05783433