Merge "Fix xml loading for managed services" into oc-mr1-dev
am: 04964fe069

Change-Id: Ia5b74cbbbe5ccfe4fbd389c7c4639368aa888648