Merge "Add class comment to avoid extending ServiceState class."