Merge "Fix test failure in FrameworksServicesTests"