Merge "Fix FrameworksServicesTests fail"