Merge "Add listen service in service context to follow sepolicy"