Merge "Update Wear Service Class Names"