[ServiceInfo] fix return values.
Merge remote-tracking branch 'upstream/master'