Merge "annotate some tests large - just in case they take longer. bug:3066136"