Merge "Rename framework and service jars"