Merge "Test case clean up." into qt-dev am: c6bc40d397
am: 8243f6ae44

Change-Id: I70978d1fe98c7e4b04c068d5d0f376d9a8be84aa