Merge "Remove bp and manifest for trm tests" into rvc-dev