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

Change-Id: I75344079f96cac1ff2318018b09bb6277bd9676e