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

Change-Id: I1e50eca34a7d12a7c6d6105e0a30ffaacf0532f8