Updating service

Change-Id: I4582554c88d20ab261e075c858bc132bcf38eaf8
Merge remote-tracking branch 'origin/master' into wmf-deploy

* origin/master:
  Updating service

Change-Id: Iad04f734bbe980f112683132e4ae0e6af7f013fa