Merge "Fix issue #38393543: Not allowed to start service Intent" into oc-dev