Merge "Rewrite testBadApkOnly (1/n)" into rvc-dev