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

Change-Id: Ie6cfe023f733079d3fb685b841bc0e90506c0ab3