Merge "Fixes AttentionManagerServiceTest."