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

Change-Id: I226e3f988fa0162eb832ffe0dadfdfda7b07a47f