Merge "Merge "Update ServiceState to adapt NetworkService change." am: 1168c31c am: bc1ea668 am: ec00ab16 -s ours"