Move service polling credentials to service_credentials

Change-Id: I74a523bcc1acd18532bb9353b70da63c70e8e325
Closes-bug: #1287939
Merge "Move service polling credentials to service_credentials"