Revert "Fix update of services for multiple backend mode"

This reverts commit 468d4e8dc21b179a846ae8abc7dec5ea80944c16.

Reason for revert: Change causing NPE b/20797663

Change-Id: Ia71efac2d8583cc5ac79879f10209784c700fbb0
2 files changed