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

Change-Id: Ife26f513fa6d04771148a3965171822874854828