Merge "Update ServiceState to adapt NetworkService change."