Merge "Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce am: 783096f02c am: e34370edfd  -s ours"