Merge "Rewrite testBadApkOnly_Phase3 (1/n)"