Merge "Don't mark Services and Activities as @Singleton"