Merge "Fix ServiceState.hashCode() bug."