Merge "Fix failing test in CompositionTest."