Merge "Update ServiceState to adapt NetworkService change." am: 1168c31c4a
am: bc1ea668f9

Change-Id: I306cb270ed1d9286739117ea0f6cb5770108ba8e