Merge "Merge "Update ServiceState to adapt NetworkService change." am: 1168c31c4a am: bc1ea668f9 am: ec00ab16ca  -s ours"