Merge "Remove logspam in service state changes" into oc-dev