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

Change-Id: I49449319f4a8cbd2540a93228131d119b1bf9475