am 73a3c9af: (-s ours) am 3632f945: am b6223793: Add support for service intents

* commit '73a3c9afac74f296ca755bde098b5c85b703aaa5':