Merge "Remove logspam in service state changes" into oc-dev am: 85d0a3893b
am: 5910c61af4

Change-Id: Id134b22e18c820fd3781c4662a2d4d396eba26bf