Otherwise the IGNORE constant will be passed down causing
a failure when building the resource path.
Also remove the local-service creation, as it is redundent, and the
Tier1 already has it at this stage.
Change-Id: I4f95e62c1a2e7f6891650bb5c33fb2777d240fb3
(cherry picked from commit a8ba441d8d)