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

Change-Id: I381303a8c079fbd299c839fc1d802f2382c41fe8